Iba0138a6 removed the custom error handler in Hooks::run(), but didn't
remove the comment describing it and left behind an unused variable.
Change-Id: I9b043fa8bd79625e63d35f95f2fa3ac1b214275c
throw new MWException( 'Invalid callback ' . $func . ' in hooks for ' . $event . "\n" );
}
throw new MWException( 'Invalid callback ' . $func . ' in hooks for ' . $event . "\n" );
}
- /*
- * Call the hook. The documentation of call_user_func_array says
- * false is returned on failure. However, if the function signature
- * does not match the call signature, PHP will issue an warning and
- * return null instead. The following code catches that warning and
- * provides better error message.
- */
- $retval = null;
- $badhookmsg = null;
- $hook_args = array_merge( $hook, $args );
-
// mark hook as deprecated, if deprecation version is specified
if ( $deprecatedVersion !== null ) {
wfDeprecated( "$event hook (used in $func)", $deprecatedVersion );
}
// mark hook as deprecated, if deprecation version is specified
if ( $deprecatedVersion !== null ) {
wfDeprecated( "$event hook (used in $func)", $deprecatedVersion );
}
+ // Call the hook.
+ $hook_args = array_merge( $hook, $args );
$retval = call_user_func_array( $callback, $hook_args );
// Process the return value.
$retval = call_user_func_array( $callback, $hook_args );
// Process the return value.